From a49077e52b2d7c1a9d9a8f0a1fc55cf742039a36 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Thu, 16 Jul 2015 20:32:45 +0100 Subject: [PATCH] tools/xl: Fix segfaults from `xl psr-cat-cbm-set` command line handling The socket option takes a mandatory argument. Mark it as such, so optarg isn't NULL when passed to trim(), which unconditionally dereference it. Range check optind against argc before blindly assuming that argv[optind] and argv[optind+1] exist. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Wei Liu CC: Chao Peng Acked-by: Ian Jackson --- tools/libxl/xl_cmdimpl.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 0cc9f8bee5..79492021eb 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -8397,7 +8397,7 @@ int main_psr_cat_cbm_set(int argc, char **argv) int i, j, len; static struct option opts[] = { - {"socket", 0, 0, 's'}, + {"socket", required_argument, 0, 's'}, COMMON_LONG_OPTS, {0, 0, 0, 0} }; @@ -8405,7 +8405,7 @@ int main_psr_cat_cbm_set(int argc, char **argv) libxl_socket_bitmap_alloc(ctx, &target_map, 0); libxl_bitmap_set_none(&target_map); - SWITCH_FOREACH_OPT(opt, "s", opts, "psr-cat-cbm-set", 1) { + SWITCH_FOREACH_OPT(opt, "s:", opts, "psr-cat-cbm-set", 1) { case 's': trim(isspace, optarg, &value); split_string_into_string_list(value, ",", &socket_list); @@ -8424,6 +8424,11 @@ int main_psr_cat_cbm_set(int argc, char **argv) if (libxl_bitmap_is_empty(&target_map)) libxl_bitmap_set_any(&target_map); + if (argc != optind + 2) { + help("psr-cat-cbm-set"); + return 2; + } + domid = find_domain(argv[optind]); cbm = strtoll(argv[optind + 1], NULL , 0); -- 2.30.2